Rename GtkActionMuxer's private header

Follow the naming policy for private headers.

diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c
index df515244ffd15aa0074ef294d285d40e02edf0d4..06fe0ed0cf453108c831da620296369a3f0ca810 100644 (file)
--- a/gtk/gtkactionmuxer.c
+++ b/gtk/gtkactionmuxer.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkactionmuxer.h"
+#include "gtkactionmuxerprivate.h"
 
 #include "gtkactionobservable.h"
 #include "gtkactionobserver.h"

diff --git a/gtk/gtkactionmuxer.h b/gtk/gtkactionmuxer.h
deleted file mode 100644 (file)
index b696fff..0000000
--- a/gtk/gtkactionmuxer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_MUXER_H__
-#define __GTK_ACTION_MUXER_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_MUXER                               (gtk_action_muxer_get_type ())
-#define GTK_ACTION_MUXER(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             GTK_TYPE_ACTION_MUXER, GtkActionMuxer))
-#define GTK_IS_ACTION_MUXER(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             GTK_TYPE_ACTION_MUXER))
-
-typedef struct _GtkActionMuxer                              GtkActionMuxer;
-
-GType                   gtk_action_muxer_get_type                       (void);
-GtkActionMuxer *        gtk_action_muxer_new                            (void);
-
-void                    gtk_action_muxer_insert                         (GtkActionMuxer *muxer,
-                                                                         const gchar    *prefix,
-                                                                         GActionGroup   *action_group);
-
-void                    gtk_action_muxer_remove                         (GtkActionMuxer *muxer,
-                                                                         const gchar    *prefix);
-const gchar **          gtk_action_muxer_list_prefixes                  (GtkActionMuxer *muxer);
-GActionGroup *          gtk_action_muxer_lookup                         (GtkActionMuxer *muxer,
-                                                                         const gchar    *prefix);
-GtkActionMuxer *        gtk_action_muxer_get_parent                     (GtkActionMuxer *muxer);
-
-void                    gtk_action_muxer_set_parent                     (GtkActionMuxer *muxer,
-                                                                         GtkActionMuxer *parent);
-
-void                    gtk_action_muxer_set_primary_accel              (GtkActionMuxer *muxer,
-                                                                         const gchar    *action_and_target,
-                                                                         const gchar    *primary_accel);
-
-const gchar *           gtk_action_muxer_get_primary_accel              (GtkActionMuxer *muxer,
-                                                                         const gchar    *action_and_target);
-
-/* No better place for these... */
-gchar *                 gtk_print_action_and_target                     (const gchar    *action_namespace,
-                                                                         const gchar    *action_name,
-                                                                         GVariant       *target);
-
-gchar *                 gtk_normalise_detailed_action_name              (const gchar *detailed_action_name);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_MUXER_H__ */

diff --git a/gtk/gtkactionmuxerprivate.h b/gtk/gtkactionmuxerprivate.h
new file mode 100644 (file)
index 0000000..b696fff
--- /dev/null
+++ b/gtk/gtkactionmuxerprivate.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_ACTION_MUXER_H__
+#define __GTK_ACTION_MUXER_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_ACTION_MUXER                               (gtk_action_muxer_get_type ())
+#define GTK_ACTION_MUXER(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             GTK_TYPE_ACTION_MUXER, GtkActionMuxer))
+#define GTK_IS_ACTION_MUXER(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             GTK_TYPE_ACTION_MUXER))
+
+typedef struct _GtkActionMuxer                              GtkActionMuxer;
+
+GType                   gtk_action_muxer_get_type                       (void);
+GtkActionMuxer *        gtk_action_muxer_new                            (void);
+
+void                    gtk_action_muxer_insert                         (GtkActionMuxer *muxer,
+                                                                         const gchar    *prefix,
+                                                                         GActionGroup   *action_group);
+
+void                    gtk_action_muxer_remove                         (GtkActionMuxer *muxer,
+                                                                         const gchar    *prefix);
+const gchar **          gtk_action_muxer_list_prefixes                  (GtkActionMuxer *muxer);
+GActionGroup *          gtk_action_muxer_lookup                         (GtkActionMuxer *muxer,
+                                                                         const gchar    *prefix);
+GtkActionMuxer *        gtk_action_muxer_get_parent                     (GtkActionMuxer *muxer);
+
+void                    gtk_action_muxer_set_parent                     (GtkActionMuxer *muxer,
+                                                                         GtkActionMuxer *parent);
+
+void                    gtk_action_muxer_set_primary_accel              (GtkActionMuxer *muxer,
+                                                                         const gchar    *action_and_target,
+                                                                         const gchar    *primary_accel);
+
+const gchar *           gtk_action_muxer_get_primary_accel              (GtkActionMuxer *muxer,
+                                                                         const gchar    *action_and_target);
+
+/* No better place for these... */
+gchar *                 gtk_print_action_and_target                     (const gchar    *action_namespace,
+                                                                         const gchar    *action_name,
+                                                                         GVariant       *target);
+
+gchar *                 gtk_normalise_detailed_action_name              (const gchar *detailed_action_name);
+
+G_END_DECLS
+
+#endif /* __GTK_ACTION_MUXER_H__ */

diff --git a/gtk/gtkapplicationaccels.c b/gtk/gtkapplicationaccels.c
index 78099402d709e85300b459362c552b0ea4967dcc..b4a14b9daa8aefae59d57bf7fb23b46514c14bac 100644 (file)
--- a/gtk/gtkapplicationaccels.c
+++ b/gtk/gtkapplicationaccels.c
@@ -20,9 +20,11 @@
  */
 
 #include "config.h"
+
 #include "gtkapplicationaccelsprivate.h"
+#include "gtkactionmuxerprivate.h"
+
 #include <string.h>
-#include "gtkactionmuxer.h"
 
 typedef struct
 {

diff --git a/gtk/gtkapplicationprivate.h b/gtk/gtkapplicationprivate.h
index 59eff0266e561cb4425ef97ee34599611452c961..74403de8948714f94f575214cea58a9f5e3bbf82 100644 (file)
--- a/gtk/gtkapplicationprivate.h
+++ b/gtk/gtkapplicationprivate.h
@@ -24,7 +24,7 @@
 #include "gtkapplicationwindow.h"
 #include "gtkwindowprivate.h"
 
-#include "gtkactionmuxer.h"
+#include "gtkactionmuxerprivate.h"
 #include "gtkapplicationaccelsprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkmenutrackeritem.c b/gtk/gtkmenutrackeritem.c
index 0a7ca8c629bb23f9bbf6f431a438e67d2c8327e7..80bf7116f91d904672bf0e0e47bfaefc0bf4f411 100644 (file)
--- a/gtk/gtkmenutrackeritem.c
+++ b/gtk/gtkmenutrackeritem.c
@@ -20,12 +20,10 @@
 #include "config.h"
 
 #include "gtkmenutrackeritem.h"
-#include "gtkactionmuxer.h"
+#include "gtkactionmuxerprivate.h"
 #include "gtkdebug.h"
 #include "gtkintl.h"
 
-#include "gtkactionmuxer.h"
-
 #include <string.h>
 
 /*< private >

diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 58b89ec13382744c9fe3cca8250d34ac77cf81e1..ca1bf4ba7340f70740d909d8aaba27171a6ec454 100644 (file)
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -121,7 +121,7 @@
 #include "gtkseparator.h"
 #include "gtkmodelbutton.h"
 #include "gtkwidgetprivate.h"
-#include "gtkactionmuxer.h"
+#include "gtkactionmuxerprivate.h"
 #include "gtkmenutracker.h"
 #include "gtkstack.h"
 #include "gtksizegroup.h"

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 75e84fe225e6a3a7e0cd6c3d050cb276ac2fbf43..616ca032d125feee2bf7a07537915ed9dd36b6f1 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -29,7 +29,7 @@
 #include "gtkwidget.h"
 #include "gtkcontainer.h"
 #include "gtkeventcontroller.h"
-#include "gtkactionmuxer.h"
+#include "gtkactionmuxerprivate.h"
 #include "gtksizerequestcacheprivate.h"
 
 G_BEGIN_DECLS